Skip to content

Merge for third delivery of P2 #65

Jump to bottom
Merged
merged 83 commits into from
Oct 30, 2026
Merged

Merge for third delivery of P2 #65

merged 83 commits into from
Oct 30, 2026
+5,305 −445

Conversation

minael
Copy link
Member

@minael minael commented Oct 30, 2026

No description provided.

karenska and others added 30 commits October 20, 2026 12:17
@karenska
feat(backend): add artwork search with filtered pagination
a6d0ce0
@karenska
test: add artwork search API tests
bdbbbed
@karenska
Merge pull request #37 from IT2810-H26/33-implement-artwork-search
be0971a 
Implement artwork search
@karenska
feat: add artist filtering and paginated artist options
0ef3121
@karenska
test: add artist filtering and artist options API tests
0e7afd4
@karenska
Merge pull request #38 from IT2810-H26/34-implement-artwork-filtering
76d44dc 
Implement artwork filtering
@karenska
feat: add artwork sorting with stable pagination
a50354f
@karenska
test: add artwork sorting API tests
7d50429
@karenska
fix: ignore double quotes in title sorting
eab7b29
@karenska
Merge pull request #39 from IT2810-H26/35-implement-artwork-sorting
5a29f3c 
Implement artwork sorting
@karenska
feat: support catalogue query options in useArtworks
2744bf3
@karenska
feat: add catalogue search controls
2b7c0b3
@karenska
style: format catalogue search controls
a18bd59
@karenska
feat: add searchable artist filter
94a7c82
@karenska
feat: add catalogue sorting controls
5540a1d
@karenska
feat: add result count and reset catalogue selections
419e028
@karenska
style: align catalogue filters and add filter icon
afe7076
@karenska
style: unify catalogue selects and improve responsive layout
bed2216
@karenska
fix: place unknown artists last in artist sorting
2ef89d3
@karenska
Merge pull request #42 from IT2810-H26/41-place-unknown-artists-last-…
e891bd7 
…when-sorting-by-artist

Place unknown artists last when sorting by artist
@karenska
Merge pull request #40 from IT2810-H26/36-add-catalogue-search-filter…
706129c 
…ing-and-sorting-controls

Add catalogue search filtering and sorting controls
@karenska
feat: normalize and import numeric artwork dates
00a8ba5
@emmafre
feat: create profile page and user type
0ef9494
@karenska
feat: add script to backfill artwork dates
4022d07
@emmafre
refactor: update CreateAccount to use the new user type
d09d6f2
@emmafre
refactor: update Login to use the new user type
e9f10cd
@emmafre
feat: add profile route in App
30bf059
@emmafre
chore: rename pages to match with the established format
2701988
@emmafre
refactor: move typeDefs to a seperate file
4e0a727
@emmafre
refactor: move password and user related code to seperate files
87faf94
minael added 23 commits October 29, 2026 20:47
@minael
feat: support up to 3 images in gallery cover
f379b02
@minael
style: adjust gallery cover image proportions
680298d
@minael
style: add spacing above footer on profile page
170dfef
@minael
Merge pull request #56 from IT2810-H26/54-add-artworks-to-gallary
e30e0cf 
Implement functionality for gallary
@minael
fix: protect profile page from unauthenticated users
0f9d074
@minael
chore: fix navigation in hero
5ef80fa
@minael
chore: change navigation from login to profile page
a13ae43
@minael
chore: redirect new users to profile after registration
45daa0b
@minael
feat: add back and logout navigation to profile
d930fcb
@minael
fix: add pointer cursor to logout button
7749181
@minael
fix: add pointer cursor to add button
e99e0a0
@minael
Merge pull request #57 from IT2810-H26/52-limit-not-logged-in-users
6d7b828 
Improve profile access and auth navigation
@minael
feat: add Zustand auth store
9381a23
@minael
refactor: use auth store for login and registration
a47eb93
@minael
refactor: use auth store for profile navigation
2a68b56
@minael
refactor: use shared auth token in gallery modals
50fdd1a
@minael
docs: update readme for delivery 3
295b325
@minael
Merge pull request #60 from IT2810-H26/55-add-shared-state-management…
0ed564f 
…-with-zustand

Add shared authentication state with zustand
@minael
Merge pull request #61 from IT2810-H26/59-update-readme-for-delivery-3
dc3fa49 
Update readme for delivery 3
@minael
chore: fix frontend dependency vulnerabilities
69d87b3
@minael
chore: fix backend dependency vulnerabilities
46a9aea
@minael
style: format code with Prettier
92df406
@minael
Merge pull request #62 from IT2810-H26/58-fix-prettier-formatting
4393be8 
Fix prettier formatting
@minael minael added this to the P2: #3 delivery milestone Oct 30, 2026
@minael minael requested a review from gurveers October 30, 2026 14:58
@minael minael self-assigned this Oct 30, 2026
@minael minael requested a review from a team as a code owner October 30, 2026 14:58
gurveers
gurveers approved these changes Oct 30, 2026
View reviewed changes
Copy link
Member

@gurveers gurveers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks as excpected!

@minael minael merged commit 8e5b779 into main Oct 30, 2026
@minael minael changed the title Merge dev to main for delivery 3 Merge for third delivery of P2 Oct 30, 2026
Sign in to join this conversation on GitHub.
Reviewers

@gurveers gurveers gurveers approved these changes

Assignees

@minael minael

Labels
None yet
Projects
None yet
Milestone
P2: #3 delivery
Development

Successfully merging this pull request may close these issues.
4 participants
@minael @gurveers @karenska @emmafre